spinner: Remove priv pointer

diff --git a/gtk/gtkspinner.c b/gtk/gtkspinner.c
index 24a492013445e046db2c9a07c5f5abf4067d5fff..f8660319bfbfc9ae80c8c53cea0b7ea0b95aeb3e 100644 (file)
--- a/gtk/gtkspinner.c
+++ b/gtk/gtkspinner.c
@@ -71,6 +71,7 @@ struct _GtkSpinnerPrivate
 {
   guint active : 1;
 };
+typedef struct _GtkSpinnerPrivate GtkSpinnerPrivate;
 
 G_DEFINE_TYPE_WITH_PRIVATE (GtkSpinner, gtk_spinner, GTK_TYPE_WIDGET)
 
@@ -123,7 +124,7 @@ static void
 gtk_spinner_set_active (GtkSpinner *spinner,
                         gboolean    active)
 {
-  GtkSpinnerPrivate *priv = spinner->priv;
+  GtkSpinnerPrivate *priv = gtk_spinner_get_instance_private (spinner);
 
   active = !!active;
 
@@ -148,9 +149,7 @@ gtk_spinner_get_property (GObject    *object,
                           GValue     *value,
                           GParamSpec *pspec)
 {
-  GtkSpinnerPrivate *priv;
-
-  priv = GTK_SPINNER (object)->priv;
+  GtkSpinnerPrivate *priv = gtk_spinner_get_instance_private (GTK_SPINNER (object));
 
   switch (param_id)
     {
@@ -213,8 +212,6 @@ gtk_spinner_class_init (GtkSpinnerClass *klass)
 static void
 gtk_spinner_init (GtkSpinner *spinner)
 {
-  spinner->priv = gtk_spinner_get_instance_private (spinner);
-
   gtk_widget_set_has_window (GTK_WIDGET (spinner), FALSE);
 }
 

diff --git a/gtk/gtkspinner.h b/gtk/gtkspinner.h
index 0da77b53c56bcf02bf01141630126194f69e5959..d21f9512c3060996c8e1af440289de2f8f487f2e 100644 (file)
--- a/gtk/gtkspinner.h
+++ b/gtk/gtkspinner.h
@@ -40,14 +40,10 @@ G_BEGIN_DECLS
 
 typedef struct _GtkSpinner      GtkSpinner;
 typedef struct _GtkSpinnerClass GtkSpinnerClass;
-typedef struct _GtkSpinnerPrivate  GtkSpinnerPrivate;
 
 struct _GtkSpinner
 {
   GtkWidget parent;
-
-  /*< private >*/
-  GtkSpinnerPrivate *priv;
 };
 
 struct _GtkSpinnerClass